Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Revert "Add direct reconciler for FirestoreDatabase"" #2673

Merged
merged 3 commits into from
Sep 11, 2024
Merged

Revert "Revert "Add direct reconciler for FirestoreDatabase"" #2673

merged 3 commits into from
Sep 11, 2024

Conversation

jasonvigil
Copy link
Collaborator

Reverts #2671

Fixed merge conflict.

@jasonvigil jasonvigil marked this pull request as ready for review September 10, 2024 22:11
@jasonvigil jasonvigil requested a review from yuwenma September 10, 2024 22:12
@jingyih
Copy link
Collaborator

jingyih commented Sep 10, 2024

Sorry about the inconvenience, was it some sort of race? I saw #2633 was merged 17 hours ago, and #2642 was merged 1 hour ago. Not sure why Github was unable to detect a conflict.

@jasonvigil
Copy link
Collaborator Author

Sorry about the inconvenience, was it some sort of race? I saw #2633 was merged 17 hours ago, and #2642 was merged 1 hour ago. Not sure why Github was unable to detect a conflict.

No worries. For both PRs, the tests passed independently, before the other was merged.

yuwenma
yuwenma reviewed Sep 11, 2024
View reviewed changes
Copy link
Collaborator

@yuwenma yuwenma left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@google-oss-prow google-oss-prow bot added the lgtm label Sep 11, 2024
@google-oss-prow Google OSS Prow
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: yuwenma

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@google-oss-prow google-oss-prow bot merged commit eda5abe into master Sep 11, 2024
17 checks passed
@jasonvigil jasonvigil deleted the revert-2671-revert-2642-firestore branch September 11, 2024 21:27
@yuwenma yuwenma added this to the 1.123 milestone Oct 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yuwenma yuwenma yuwenma left review comments

Assignees

@yuwenma yuwenma

Labels
approved lgtm service:firestore
Projects
None yet
Milestone
1.123
Development

Successfully merging this pull request may close these issues.
3 participants
@jasonvigil @jingyih @yuwenma